Make compile.

Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
	Make compile.

	* gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
	with calling gtk_widget_set_style_internal() with
	the old style, not the new style. (#56989)

diff --git a/ChangeLog b/ChangeLog
index e4928ac7c302ac788cec64c31c4c6ff7338eb68f..5021df944ab4a9dd6619271dc360f6a28d3dc5fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
+       Make compile.
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
+       with calling gtk_widget_set_style_internal() with
+       the old style, not the new style. (#56989)
+
 Wed Jul  4 22:35:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e4928ac7c302ac788cec64c31c4c6ff7338eb68f..5021df944ab4a9dd6619271dc360f6a28d3dc5fd 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
+       Make compile.
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
+       with calling gtk_widget_set_style_internal() with
+       the old style, not the new style. (#56989)
+
 Wed Jul  4 22:35:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e4928ac7c302ac788cec64c31c4c6ff7338eb68f..5021df944ab4a9dd6619271dc360f6a28d3dc5fd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
+       Make compile.
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
+       with calling gtk_widget_set_style_internal() with
+       the old style, not the new style. (#56989)
+
 Wed Jul  4 22:35:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e4928ac7c302ac788cec64c31c4c6ff7338eb68f..5021df944ab4a9dd6619271dc360f6a28d3dc5fd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
+       Make compile.
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
+       with calling gtk_widget_set_style_internal() with
+       the old style, not the new style. (#56989)
+
 Wed Jul  4 22:35:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e4928ac7c302ac788cec64c31c4c6ff7338eb68f..5021df944ab4a9dd6619271dc360f6a28d3dc5fd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
+       Make compile.
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
+       with calling gtk_widget_set_style_internal() with
+       the old style, not the new style. (#56989)
+
 Wed Jul  4 22:35:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e4928ac7c302ac788cec64c31c4c6ff7338eb68f..5021df944ab4a9dd6619271dc360f6a28d3dc5fd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
+       Make compile.
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
+       with calling gtk_widget_set_style_internal() with
+       the old style, not the new style. (#56989)
+
 Wed Jul  4 22:35:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e4928ac7c302ac788cec64c31c4c6ff7338eb68f..5021df944ab4a9dd6619271dc360f6a28d3dc5fd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Wed Jul  4 23:17:04 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed):
+       Make compile.
+
+       * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem
+       with calling gtk_widget_set_style_internal() with
+       the old style, not the new style. (#56989)
+
 Wed Jul  4 22:35:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index f97ad54d3e514ada8b2847053087c9c462653519..cd3f14cb108cff09167337f638f55602f6ff448f 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -208,7 +208,7 @@ static void     gtk_drag_proxy_begin            (GtkWidget        *widget,
                                                 guint32           time);
 static void     gtk_drag_dest_realized          (GtkWidget        *widget);
 static void     gtk_drag_dest_hierarchy_changed (GtkWidget        *widget,
-                                                GtkWidget        *old_toplevel);
+                                                GtkWidget        *previous_toplevel);
 static void     gtk_drag_dest_site_destroy      (gpointer          data);
 static void     gtk_drag_dest_leave             (GtkWidget        *widget,
                                                 GdkDragContext   *context,
@@ -1438,7 +1438,8 @@ gtk_drag_dest_realized (GtkWidget *widget)
 }
 
 static void
-gtk_drag_dest_hierarchy_changed (GtkWidget *widget)
+gtk_drag_dest_hierarchy_changed (GtkWidget *widget,
+                                GtkWidget *previous_toplevel)
 {
   GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
 

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 29bf94167cd84170f088089c7c54029c45ddec14..34bfb84883dd6927c0e543e7f6fdfb0a1049944f 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3253,7 +3253,7 @@ gtk_widget_set_name (GtkWidget     *widget,
 
   g_object_notify (G_OBJECT (widget), "name");
 }
-s
+
 /**
  * gtk_widget_get_name:
  * @widget: a #GtkWidget
@@ -3574,7 +3574,7 @@ gtk_widget_reset_rc_style (GtkWidget *widget)
     new_style = gtk_widget_get_default_style ();
 
   if (initial_emission || new_style != widget->style)
-    gtk_widget_set_style_internal (widget, widget->style, TRUE);
+    gtk_widget_set_style_internal (widget, new_style, TRUE);
 }
 
 /**